bitkeeper revision 1.1716 (42b336f8VKVQeJVq9gIppvvdYPrMmw)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 17 Jun 2005 20:47:52 +0000 (20:47 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 17 Jun 2005 20:47:52 +0000 (20:47 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

1  2 
tools/python/xen/xend/XendDomainInfo.py
tools/python/xen/xend/image.py

Simple merge